From edcc0c27837955573d159af6fa58e62f402d684b Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 20 Feb 2016 17:17:39 +0100
Subject: [PATCH] Adwaita: resurrect scale-has-marks-above/below classes

the colorscales use said classes.
---
 gtk/theme/Adwaita/_common.scss           |  4 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 48 ++++++++++++++++++++++++
 gtk/theme/Adwaita/gtk-contained.css      | 48 ++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2cd5891702..51e05d5953 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2596,9 +2596,7 @@ scale {
                                  (':disabled', '-insensitive'),
                                  (':backdrop', '-backdrop'),
                                  (':backdrop:disabled', '-backdrop-insensitive') {
-
-          &.fine-tune trough#{$nth_child} {}
-
+          &.#{$marks_infix} trough,
           trough#{$nth_child} {
             slider {
               margin: 0 1px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index bde7da0bff..3459823519 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2765,8 +2765,10 @@ scale {
         -gtk-icon-shadow: none; }
   scale marks {
     color: alpha(currentColor,0.4); }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider,
     scale trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2775,8 +2777,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:hover,
     scale trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2785,8 +2789,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:active,
     scale trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2795,8 +2801,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:disabled,
     scale trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2805,8 +2813,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:backdrop,
     scale trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2815,8 +2825,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:backdrop:disabled,
     scale trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2825,8 +2837,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider,
     scale trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2834,8 +2848,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:hover,
     scale trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2843,8 +2859,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:active,
     scale trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2852,8 +2870,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:disabled,
     scale trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2861,8 +2881,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:backdrop,
     scale trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2870,8 +2892,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:backdrop:disabled,
     scale trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2879,8 +2903,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider,
     scale.vertical trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2888,8 +2914,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:hover,
     scale.vertical trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2897,8 +2925,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:active,
     scale.vertical trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2906,8 +2936,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:disabled,
     scale.vertical trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2915,8 +2947,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:backdrop,
     scale.vertical trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2924,8 +2958,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:backdrop:disabled,
     scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2933,8 +2969,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider,
     scale.vertical trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2942,8 +2980,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:hover,
     scale.vertical trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2951,8 +2991,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:active,
     scale.vertical trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2960,8 +3002,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:disabled,
     scale.vertical trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2969,8 +3013,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:backdrop,
     scale.vertical trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2978,8 +3024,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:backdrop:disabled,
     scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index ca5623a6b9..9dffce1f27 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2796,8 +2796,10 @@ scale {
         -gtk-icon-shadow: none; }
   scale marks {
     color: alpha(currentColor,0.4); }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider,
     scale trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2806,8 +2808,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:hover,
     scale trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2816,8 +2820,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:active,
     scale trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2826,8 +2832,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:disabled,
     scale trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2836,8 +2844,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:backdrop,
     scale trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2846,8 +2856,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-above trough slider,
   scale trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-above trough slider:backdrop:disabled,
     scale trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2856,8 +2868,10 @@ scale {
       background-position: top;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider,
     scale trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2865,8 +2879,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:hover,
     scale trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2874,8 +2890,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:active,
     scale trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2883,8 +2901,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:disabled,
     scale trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2892,8 +2912,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:backdrop,
     scale trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2901,8 +2923,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.scale-has-marks-below trough slider,
   scale trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.scale-has-marks-below trough slider:backdrop:disabled,
     scale trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2910,8 +2934,10 @@ scale {
       background-position: bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider,
     scale.vertical trough:last-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2919,8 +2945,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:hover,
     scale.vertical trough:last-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2928,8 +2956,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:active,
     scale.vertical trough:last-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2937,8 +2967,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:disabled,
     scale.vertical trough:last-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -2946,8 +2978,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:backdrop,
     scale.vertical trough:last-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -2955,8 +2989,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-above trough slider,
   scale.vertical trough:last-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-above trough slider:backdrop:disabled,
     scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
@@ -2964,8 +3000,10 @@ scale {
       background-position: left bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider,
     scale.vertical trough:first-child:not(:only-child) slider {
       border-style: none;
       border-radius: 0;
@@ -2973,8 +3011,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:hover,
     scale.vertical trough:first-child:not(:only-child) slider:hover {
       border-style: none;
       border-radius: 0;
@@ -2982,8 +3022,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:active,
     scale.vertical trough:first-child:not(:only-child) slider:active {
       border-style: none;
       border-radius: 0;
@@ -2991,8 +3033,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:disabled,
     scale.vertical trough:first-child:not(:only-child) slider:disabled {
       border-style: none;
       border-radius: 0;
@@ -3000,8 +3044,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:backdrop,
     scale.vertical trough:first-child:not(:only-child) slider:backdrop {
       border-style: none;
       border-radius: 0;
@@ -3009,8 +3055,10 @@ scale {
       background-position: right bottom;
       background-repeat: no-repeat;
       box-shadow: none; }
+  scale.vertical.scale-has-marks-below trough slider,
   scale.vertical trough:first-child:not(:only-child) slider {
     margin: 0 1px; }
+    scale.vertical.scale-has-marks-below trough slider:backdrop:disabled,
     scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
       border-style: none;
       border-radius: 0;
-- 
2.30.2